Enable skipping plugins search at build time.

Forwarded: not-needed

This patch sets
QT_SKIP_AUTO_PLUGIN_INCLUSION and QT_SKIP_AUTO_QML_PLUGIN_INCLUSION to ON
by default, thus avoiding unnecesary build dependencies on plugins.

The variables can still be set to OFF by the user at build time, allowing
them to find the packages if necessary. But if you need so for a Debian
package please reach the Qt maintainers first. We want to know why you
need to do so. Thanks in advance!

Gbp-Pq: Name enable_skip_plugins.patch

diff --git a/cmake/QtPlugins.cmake.in b/cmake/QtPlugins.cmake.in
index e668a4cbefef418adfd7369e82c52c03b48eac00..d086316b4c7c68a5e7b2c96aca0a2bad53a6f676 100644 (file)
--- a/cmake/QtPlugins.cmake.in
+++ b/cmake/QtPlugins.cmake.in
@@ -6,7 +6,7 @@ include_guard(DIRECTORY)
 
 # Distributions should probably change this default.
 if(NOT DEFINED QT_SKIP_AUTO_PLUGIN_INCLUSION)
-    set(QT_SKIP_AUTO_PLUGIN_INCLUSION OFF)
+    set(QT_SKIP_AUTO_PLUGIN_INCLUSION ON)
 endif()
 
 if(NOT QT_NO_CREATE_TARGETS AND NOT QT_SKIP_AUTO_PLUGIN_INCLUSION)

diff --git a/cmake/QtPublicPluginHelpers.cmake b/cmake/QtPublicPluginHelpers.cmake
index 44ceb92e24698c7bba436db9b4fd0c6a445b5f0a..2a2ee1c5e92aeda3311b2433b795b802bb8d1132 100644 (file)
--- a/cmake/QtPublicPluginHelpers.cmake
+++ b/cmake/QtPublicPluginHelpers.cmake
@@ -649,7 +649,7 @@ macro(__qt_internal_include_qml_plugin_packages)
 
     # Distributions should probably change this default.
     if(NOT DEFINED QT_SKIP_AUTO_QML_PLUGIN_INCLUSION)
-        set(QT_SKIP_AUTO_QML_PLUGIN_INCLUSION OFF)
+        set(QT_SKIP_AUTO_QML_PLUGIN_INCLUSION ON)
     endif()
 
     set(__qt_qml_plugins_config_file_list "")